Ref the new icons before unreffing the old ones. (#154468, Morten

2004-10-04  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkwindow.c (gtk_window_set_icon_list):
	(gtk_window_set_default_icon_list): Ref the new
	icons before unreffing the old ones.  (#154468, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index db0ad27b38ae53a9e87b21006dd06b090e3a6c93..2bc45dcdf66e8d52707dae6ca8120ae2e2f39fc9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2004-10-04  Matthias Clasen  <mclasen@redhat.com>
 
-       * gtk/gtkwindow.c (gtk_window_set_icon_list): Ref the new icons
+       * gtk/gtkwindow.c (gtk_window_set_icon_list): 
+       (gtk_window_set_default_icon_list): Ref the new icons
        before unreffing the old ones.  (#154468, Morten Welinder)
 
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index db0ad27b38ae53a9e87b21006dd06b090e3a6c93..2bc45dcdf66e8d52707dae6ca8120ae2e2f39fc9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,7 @@
 2004-10-04  Matthias Clasen  <mclasen@redhat.com>
 
-       * gtk/gtkwindow.c (gtk_window_set_icon_list): Ref the new icons
+       * gtk/gtkwindow.c (gtk_window_set_icon_list): 
+       (gtk_window_set_default_icon_list): Ref the new icons
        before unreffing the old ones.  (#154468, Morten Welinder)
 
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index db0ad27b38ae53a9e87b21006dd06b090e3a6c93..2bc45dcdf66e8d52707dae6ca8120ae2e2f39fc9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,6 +1,7 @@
 2004-10-04  Matthias Clasen  <mclasen@redhat.com>
 
-       * gtk/gtkwindow.c (gtk_window_set_icon_list): Ref the new icons
+       * gtk/gtkwindow.c (gtk_window_set_icon_list): 
+       (gtk_window_set_default_icon_list): Ref the new icons
        before unreffing the old ones.  (#154468, Morten Welinder)
 
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index db0ad27b38ae53a9e87b21006dd06b090e3a6c93..2bc45dcdf66e8d52707dae6ca8120ae2e2f39fc9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,6 +1,7 @@
 2004-10-04  Matthias Clasen  <mclasen@redhat.com>
 
-       * gtk/gtkwindow.c (gtk_window_set_icon_list): Ref the new icons
+       * gtk/gtkwindow.c (gtk_window_set_icon_list): 
+       (gtk_window_set_default_icon_list): Ref the new icons
        before unreffing the old ones.  (#154468, Morten Welinder)
 
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 20663570342982362e3b2ff7244cc935dac06daf..b61efceb9de171f940c39f177ba7af1ab5415b74 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3125,14 +3125,15 @@ gtk_window_set_default_icon_list (GList *list)
    */
   default_icon_serial++;
   
+  g_list_foreach (list,
+                  (GFunc) g_object_ref, NULL);
+
   g_list_foreach (default_icon_list,
                   (GFunc) g_object_unref, NULL);
 
   g_list_free (default_icon_list);
 
   default_icon_list = g_list_copy (list);
-  g_list_foreach (default_icon_list,
-                  (GFunc) g_object_ref, NULL);
   
   /* Update all toplevels */
   toplevels = gtk_window_list_toplevels ();